x86: Remove EF_* duplicate defs for X86_EFLAGS_*.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c
index 4e064a66fd5721856bbc4a3967c6a75974e644b6..7735e3a6fb5eb74f27c24f1059daa1d3846f5777 100644 (file)
--- a/xen/arch/x86/acpi/suspend.c
+++ b/xen/arch/x86/acpi/suspend.c
@@ -46,7 +46,10 @@ void restore_rest_processor_state(void)
     wrmsrl(MSR_LSTAR, saved_lstar);
     wrmsrl(MSR_CSTAR, saved_cstar);
     wrmsr(MSR_STAR, 0, (FLAT_RING3_CS32<<16) | __HYPERVISOR_CS);
-    wrmsr(MSR_SYSCALL_MASK, EF_VM|EF_RF|EF_NT|EF_DF|EF_IE|EF_TF, 0U);    
+    wrmsr(MSR_SYSCALL_MASK,
+          X86_EFLAGS_VM|X86_EFLAGS_RF|X86_EFLAGS_NT|
+          X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_TF,
+          0U);
 
     if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL )
     {

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index b8478b5d2848ef22d8c0232a01eb7d2a262fe445..064f5dc2145bccdcbc161bab508cc25cda29f630 100644 (file)
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -676,10 +676,10 @@ int arch_set_info_guest(
 
     /* IOPL privileges are virtualised. */
     v->arch.iopl = (v->arch.guest_context.user_regs.eflags >> 12) & 3;
-    v->arch.guest_context.user_regs.eflags &= ~EF_IOPL;
+    v->arch.guest_context.user_regs.eflags &= ~X86_EFLAGS_IOPL;
 
     /* Ensure real hardware interrupts are enabled. */
-    v->arch.guest_context.user_regs.eflags |= EF_IE;
+    v->arch.guest_context.user_regs.eflags |= X86_EFLAGS_IF;
 
     cr4 = v->arch.guest_context.ctrlreg[4];
     v->arch.guest_context.ctrlreg[4] = cr4 ? pv_guest_cr4_fixup(cr4) :

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 6b36dd9f01676a2815ef82c299379fb9227f90b8..cb5bec7f712e8e9d502e6a19d39da22b0887c0bc 100644 (file)
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -1154,7 +1154,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c)
     else
     {
         /* IOPL privileges are virtualised: merge back into returned eflags. */
-        BUG_ON((c(user_regs.eflags) & EF_IOPL) != 0);
+        BUG_ON((c(user_regs.eflags) & X86_EFLAGS_IOPL) != 0);
         c(user_regs.eflags |= v->arch.iopl << 12);
 
         if ( !is_pv_32on64_domain(v->domain) )

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 16f59b2780d9f29753f6a696c7bd3e4a89d8efa4..59a835e3b61893f681bcc618aedb46a1d5f735ca 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1251,7 +1251,7 @@ static int hvm_load_segment_selector(
     struct cpu_user_regs *regs = guest_cpu_user_regs();
     struct vcpu *v = current;
 
-    if ( regs->eflags & EF_VM )
+    if ( regs->eflags & X86_EFLAGS_VM )
     {
         segr.sel = sel;
         segr.base = (uint32_t)sel << 4;

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 8a066cc41c69f5e8c9b3e065b7876c96cfdc1573..b26e89f0b94af4d5acf6f87b239ca28763e54f60 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1852,7 +1852,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs)
                                      PFEC_write_access);
                 return EXCRET_fault_fixed;
             }
-            wr_ad(edi, regs->edi + (int)((regs->eflags & EF_DF)
+            wr_ad(edi, regs->edi + (int)((regs->eflags & X86_EFLAGS_DF)
                                          ? -op_bytes : op_bytes));
             break;
 
@@ -1871,7 +1871,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs)
                 return EXCRET_fault_fixed;
             }
             guest_io_write(port, op_bytes, data, v, regs);
-            wr_ad(esi, regs->esi + (int)((regs->eflags & EF_DF)
+            wr_ad(esi, regs->esi + (int)((regs->eflags & X86_EFLAGS_DF)
                                          ? -op_bytes : op_bytes));
             break;
         }
@@ -2998,7 +2998,7 @@ asmlinkage void do_debug(struct cpu_user_regs *regs)
 
     if ( !guest_mode(regs) )
     {
-        if ( regs->eflags & EF_TF )
+        if ( regs->eflags & X86_EFLAGS_TF )
         {
 #ifdef __x86_64__
             void sysenter_entry(void);
@@ -3008,14 +3008,14 @@ asmlinkage void do_debug(struct cpu_user_regs *regs)
                  (regs->rip <= (unsigned long)sysenter_eflags_saved) )
             {
                 if ( regs->rip == (unsigned long)sysenter_eflags_saved )
-                    regs->eflags &= ~EF_TF;
+                    regs->eflags &= ~X86_EFLAGS_TF;
                 goto out;
             }
 #endif
             if ( !debugger_trap_fatal(TRAP_debug, regs) )
             {
                 WARN_ON(1);
-                regs->eflags &= ~EF_TF;
+                regs->eflags &= ~X86_EFLAGS_TF;
             }
         }
         else

diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index 4c74785c74a9302fd563ff990a27f0c22f73148a..e1c65ee53f3cedb3d572e66e687f4a1b809b9795 100644 (file)
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -296,7 +296,8 @@ unsigned long do_iret(void)
 
     regs->rip    = iret_saved.rip;
     regs->cs     = iret_saved.cs | 3; /* force guest privilege */
-    regs->rflags = (iret_saved.rflags & ~(EF_IOPL|EF_VM)) | EF_IE;
+    regs->rflags = ((iret_saved.rflags & ~(X86_EFLAGS_IOPL|X86_EFLAGS_VM))
+                    | X86_EFLAGS_IF);
     regs->rsp    = iret_saved.rsp;
     regs->ss     = iret_saved.ss | 3; /* force guest privilege */
 
@@ -359,7 +360,7 @@ end:
     v->trap_priority = v->old_trap_priority;
 
     /* Restore upcall mask from supplied EFLAGS.IF. */
-    vcpu_info(v, evtchn_upcall_mask) = !(iret_saved.rflags & EF_IE);
+    vcpu_info(v, evtchn_upcall_mask) = !(iret_saved.rflags & X86_EFLAGS_IF);
 
     /* Saved %rax gets written back to regs->rax in entry.S. */
     return iret_saved.rax;
@@ -464,7 +465,10 @@ void __devinit subarch_percpu_traps_init(void)
 
     /* Common SYSCALL parameters. */
     wrmsr(MSR_STAR, 0, (FLAT_RING3_CS32<<16) | __HYPERVISOR_CS);
-    wrmsr(MSR_SYSCALL_MASK, EF_VM|EF_RF|EF_NT|EF_DF|EF_IE|EF_TF, 0U);
+    wrmsr(MSR_SYSCALL_MASK,
+          X86_EFLAGS_VM|X86_EFLAGS_RF|X86_EFLAGS_NT|
+          X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_TF,
+          0U);
 }
 
 void init_int80_direct_trap(struct vcpu *v)

diff --git a/xen/include/asm-x86/regs.h b/xen/include/asm-x86/regs.h
index 3018cdd3dc6e7a5e0092736b3d8171d6b7101f9d..65dee6ed28541061452e2c0bec3cb200212510bc 100644 (file)
--- a/xen/include/asm-x86/regs.h
+++ b/xen/include/asm-x86/regs.h
@@ -8,29 +8,6 @@
 #include <asm/x86_32/regs.h>
 #endif
 
-enum EFLAGS {
-    EF_CF   = 0x00000001,
-    EF_PF   = 0x00000004,
-    EF_AF   = 0x00000010,
-    EF_ZF   = 0x00000040,
-    EF_SF   = 0x00000080,
-    EF_TF   = 0x00000100,
-    EF_IE   = 0x00000200,
-    EF_DF   = 0x00000400,
-    EF_OF   = 0x00000800,
-    EF_IOPL = 0x00003000,
-    EF_IOPL_RING0 = 0x00000000,
-    EF_IOPL_RING1 = 0x00001000,
-    EF_IOPL_RING2 = 0x00002000,
-    EF_NT   = 0x00004000,   /* nested task */
-    EF_RF   = 0x00010000,   /* resume */
-    EF_VM   = 0x00020000,   /* virtual mode */
-    EF_AC   = 0x00040000,   /* alignment */
-    EF_VIF  = 0x00080000,   /* virtual interrupt */
-    EF_VIP  = 0x00100000,   /* virtual interrupt pending */
-    EF_ID   = 0x00200000,   /* id */
-};
-
 #define guest_mode(r)                                                         \
 ({                                                                            \
     unsigned long diff = (char *)guest_cpu_user_regs() - (char *)(r);         \

diff --git a/xen/include/asm-x86/x86_32/regs.h b/xen/include/asm-x86/x86_32/regs.h
index c65c57ffe42c7406a5b5c7c9c6faeaa6a7b5e4f8..fb28d6e5fb626c4b2adef69157f08e1f399932d5 100644 (file)
--- a/xen/include/asm-x86/x86_32/regs.h
+++ b/xen/include/asm-x86/x86_32/regs.h
@@ -4,7 +4,7 @@
 #include <xen/types.h>
 #include <public/xen.h>
 
-#define vm86_mode(r) ((r)->eflags & EF_VM)
+#define vm86_mode(r) ((r)->eflags & X86_EFLAGS_VM)
 #define ring_0(r)    (((r)->cs & 3) == 0)
 #define ring_1(r)    (((r)->cs & 3) == 1)
 #define ring_2(r)    (((r)->cs & 3) == 2)